Fix macros to correspond with new layout and not to be too complicated