enabled commented out parts and added tab icons