Add additional margin space & fixed colors last time