Refactored to use ps-ui as an external library for easier updates
Hopefully refactored everything to use ps-ui as an external library