Tidy up floating toolbar, move color picker into button