minor functionality and desgin updates