A few ui changes, filter and buttons