Menu was added, some ui changes