some style fixes and further screen implementation