Update: Make some layout better