Applied some Usability recomendations