Streamlined corner buttons. Fixes #315
Merge pull request #324 from jorgesilva/develop

Streamlined corner buttons. Fixes #315