Fixed last commit and layout.