More design and clean up scss