added scss and moved some stuff around