Removed some unnecessary code and added tab icons