Alignment fixes

Fixed some colours, states, button alignments, positioned absolute the
expand button.