Few layout fixes and changes on the er diagram