minor code cleanup (indentation, got rid of lines we dont need, etc)
fixed bug, now all tabs load from their own layout file