Some structure updates, mainly for viewscreens