Revert some layout stuff ; move the favorite Button