Fixed white space and added bar button