added settings screen; cosmetic changes