adding automatic focus, further layout improvements and styling