Added cleaned up base layout