Updated layout to fix bugs