moving again; first steps to better UI