Image changes, minor UI restructure