How to make more space / improve my setup?