Re-arranged buttons a bit