Update to remove damn layout manager and make it more modular