move minimaps to the right again, some cleanup