Removed some unnecessary layouts.