Some hotfixes to target fragment and device list layout