Moved render services to helper, fixed some styles