refactoring js, tweaked icons and screens