26052014-1

Performance fixes / UI fixes