Improved some positioning and colors