new ui + some changes