Changed some descriptions and layout