Minor changes to layout to make runnable