Fixing issue 145
Fixing issue 142
Fixing color and position for 146
Fixing issue 149