added panding and fixed/changed color