Flat ui + some fixes