Fix small code issues and duplications

Fixed some issues in the way I wrote Vue code the
first time, but its not what I want it to be... going
to tear it down and build it back up using Vue components