This Fixes #754,#755,#656,#828,#823 #877 

Adjusted margin further