Fixed formatting issues and moved css to sass