UI enhancements, stack on right not working ATM