Fixed: Layout issues