[MOD]fix layout and color