Added more screens

Moved Button class
Bug with EditScreen - need to make a pause before read a mouseclick