Split controller to multiple files and fixed spinner style