- modifications according to wireframe (more to come..)