Rearrange frontend