Removed nested activities and fixed all serious bugs