Wip/better screens