Added basic layout and activity entity