Added selectable and fixed bugs