Clean solution and fix scroll bars