changed some UI stuff so I can pull again
Fixed Conflicts and added UIClearBuffer and cleaned up ATM.cpp