Push all the changes from the last weeks trying to get the basic screens in place with Lulu's suggestions.