Updated to use appropriate WP functions and usage improvement
Added default behavior and possibility to use complete different view