Move taglist to the right and some code cleanup