Minor changes and beta screen component