code maid refactoring
ui amd model fixes