@orta => Storyboard changes

Made sure all text fields and buttons are proper class

Rearranged story board to be easier to navigate
this was fixed by #94