Fixed name, added basic layout