Updated Main UI