small stuff
sidebar added
resolving merge con with app.scss