Improve ResultViewController flow and ui