Improved layout. Added top buttons.