Cleanup of branch, portrait mode, new icon