Render refactor (with couple of fixes)

I think this should be removed. Or is the input container scale modified anywhere?