switch to macros
cleanup welcome page