updated js and ui
user and layout adjustments
fixed master conflicts
card partial adjustments