Move some things around; add mode bar