Additional prettyness

Update page layout, buttons