Move some stuff around
Add logo