Modified tabs and added border