Mostly working ui replacement
New UI