Fixed bug causing layout to break