Revise layout and nag, optimize load time