Cleaned up the stock UI