Fixed minor styling bugs
Staging branch initial