various commits
conflicts resolved
various layout changes
conflict resolved