Added a picker and fixed some linking issue