Small modifications to layout