added more screen components