Fixed few issues with layout.