Started on styling
completing merge