wip - better styling