Ticket #2 - Added more options for the config pannel