Scalable UI
Remove old code