Fixed PHP warning in main file and fixed some shortcode display bugs.