Last fixes

Some last fixes, which didn’t look very well on the final app.