move 'add apps' entry into normal navigation instead of a new line
rearrange CSS, remove duplicate code
more CSS rearranging, removing duplicate code