Updated Core

Moving code to additional functions. Fixing display issue with loading
message