Made the layout a bit more dynamic.