merge changes from original angular tablet ui fork