Changed colors and modified table layout