Fix minor elements positioning bugs