cleanup
Defv' feedback
Some todo's
Made the tabs work