Few changes and addition to style and macros
Merging with remote