Fixes to margins and renaming id's