applied a more rounded layout, minor changes