Streamlined corner buttons. Fixes #315