Switched name and moved button to right