updated scss and more functionality