work in progress in separating logic
added some css