Corrected roles implementation, added some style and other minor fixes