Move towards proper styling