Added initial tabs implementation and cleaned up some formatting
fixed annoying things with tabs