Move some stuff around and setup css