Add build first app part 2 and fix layout