Added rub on startup option
Refactored design