added mq and adjusted naming
adjusted naming and margin stuff