Added some design changes and fixed table display