Visual tweaks and got search by id working