Refactored layouts and tweaked some stuff