+1. you won't get where you want to go without convincing your body that it needs to build calorie-consuming muscle. it only builds muscle when it sees it as absolutely necessary, ie so that weight you used last week doesn't crush you this week.
you'll also need to keep better track of your diet. I can't remember what I did yesterday but I can remember what I ate. yes, I have problems... lol but back to the topic.
forget the idea of losing fat and building muscle at the same time. that is the Holy Grail of physique manipulation, but the truth is that the diet and training for one is contradictory to the other. pick one goal, then eat and train for that goal.
imo, you should fill out your frame with more muscle doing basic, big movements (bench, squat, deadlift, curls, pullups, etc) using dumbbells and barbells whenever possible. machines are for people who need to work around injuries, or advanced trainees looking for an additional stimulus. since you didn't mention any injuries, you are neither.
don't miss training sessions, go balls out in the gym, and don't miss meals. do this consistently and correctly for months and you will begin to create a solid foundation that you can build upon and refine in the years to come.