More small tweaks. Fixed the table layout issue for overflow.