Made some changes and added a top bar