margin causing problems in login screen solved
merging from upstrea/master