Wap UI beautifications