Rearrange buttons, add modal content, update CSS