Starting working on better styling