Colors and layout bug fixed ...