Fixed issue with top/left margins; cleaned up naming