Cleaned up some imports to remove warnings and such

Tabbed layout incoming