Added spinner during lookup

Added spinner during lookup
Tidied up layout