Updated formatting and buttons