Changed scene layout and optimized fluid code

The optimizations are listed here:
https://trello.com/c/8RhDKNyX/43-further-memory-optimizations-for-the-fluid-code