Removed two buttons since it will be organized in some other way